Worked around the random CTS testOtherH264ImageReader & DecodeAccuracyTest failure. am: dfc4b4b2ca Change-Id: I31fe68c74df53712d4b6ccba71e68271cb2fe476